window: Unroot with old display
authorTimm Bäder <mail@baedert.org>
Sat, 27 Jul 2019 05:57:06 +0000 (07:57 +0200)
committerTimm Bäder <mail@baedert.org>
Sat, 27 Jul 2019 05:57:06 +0000 (07:57 +0200)
Things might rely on the old display being set while unrooting.

Fixes #2052

gtk/gtkwindow.c

index 5061f7e648735ce08cb04076dc423eefdf117d1c..1ee033f1939178a01feafd6b3dd69dbb528dd360 100644 (file)
@@ -8087,9 +8087,10 @@ gtk_window_set_display (GtkWindow  *window,
                     "notify::gtk-application-prefer-dark-theme",
                     G_CALLBACK (gtk_window_on_theme_variant_changed), window);
 #endif
-  priv->display = display;
 
   gtk_widget_unroot (widget);
+  priv->display = display;
+
   gtk_widget_root (widget);
 
   g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_DISPLAY]);